Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 29 Mar 2010 21:51:58 +0000 (21:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 29 Mar 2010 21:51:58 +0000 (21:51 +0000)

Trivial merge